Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Goob Mechs #1611

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Goob Mechs #1611

wants to merge 14 commits into from
+4,701 −106

Conversation

sleepyyapril
Copy link
Contributor

@sleepyyapril sleepyyapril commented Jan 20, 2025 •
edited
Loading

Description

We like mechs here, yeah?

Changelog

🆑 Mocho, John Space

  • tweak: The H.O.N.K. has received an airtight cabin for honk operations in outer space.
  • add: Added the Ripley MK-II, a heavy, slow all-purpose mech, featuring a pressurized cabin for space operations.
  • add: Added the Clarke, A fast moving mech for space travel, with built in thrusters (not certain if they work properly though :trollface:)
  • add: Added the Gygax, a lightly armored and highly mobile mech with enough force to rip walls, or someone's head off.
  • add: Added the Durand, a slow but beefy combat suit that you dont want to fight in close quarters.
  • add: Added the Marauder, a specialized mech issued to ERT operatives.
  • add: Added the Seraph, a specialized combat suit issued to ??? operatives.
  • add: The syndicate has started issuing units under the codenames "Dark Gygax" and "Mauler" to syndicate agents at an introductory price.
  • add: The exosuit fabricator can now be emagged to reveal new recipes.
  • add: There are 4 new bounties cargo can fulfill for mechs. Feedback on the cost/reward is welcome!

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an RSI Status: Needs Review Someone please review this labels Jan 20, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 20, 2025 •
edited
Loading

RSI Diff Bot; head commit 804d0e5 merging into bcdc010
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi

State Old New Status
ripley_chassis Modified
ripley_harness+o Modified
ripley_harness Modified

Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi

State Old New Status
mecha_air_tank Added
mecha_bin Added
mecha_camera Added
mecha_chainsword Added
mecha_radio Added
mecha_sleeper Added
mecha_syringegun Added
paddy_claw Added
paddyupgrade Added

Resources/Textures/_Goobstation/Objects/Specific/Mech/clarke_construction.rsi

State Old New Status
clarke0 Added
clarke1 Added
clarke10 Added
clarke11 Added
clarke12 Added
clarke13 Added
clarke14 Added
clarke15 Added
clarke16 Added
clarke2 Added
clarke3 Added
clarke4 Added
clarke5 Added
clarke6 Added
clarke7 Added
clarke8 Added
clarke9 Added
clarke_chassis Added
clarke_harness+o Added
clarke_harness Added
clarke_head+o Added
clarke_head Added
clarke_l_arm+o Added
clarke_l_arm Added
clarke_r_arm+o Added
clarke_r_arm Added
clarke_treads+o Added
clarke_treads Added

Resources/Textures/_Goobstation/Objects/Specific/Mech/durand_construction.rsi

State Old New Status
durand0 Added
durand1 Added
durand10 Added
durand11 Added
durand12 Added
durand13 Added
durand14 Added
durand15 Added
durand16 Added
durand17 Added
durand18 Added
durand2 Added
durand3 Added
durand4 Added
durand5 Added
durand6 Added
durand7 Added
durand8 Added
durand9 Added
durand_armor Added
durand_chassis Added
durand_harness+o Added
durand_harness Added
durand_head+o Added
durand_head Added
durand_l_arm+o Added
durand_l_arm Added
durand_l_leg+o Added
durand_l_leg Added
durand_r_arm+o Added
durand_r_arm Added
durand_r_leg+o Added
durand_r_leg Added

Resources/Textures/_Goobstation/Objects/Specific/Mech/gygax_construction.rsi

State Old New Status
gygax0 Added
gygax1 Added
gygax10 Added
gygax11 Added
gygax12 Added
gygax13 Added
gygax14 Added
gygax15 Added
gygax16 Added
gygax17 Added
gygax18 Added
gygax19 Added
gygax2 Added
gygax20 Added
gygax3 Added
gygax4 Added
gygax5 Added
gygax6 Added
gygax7 Added
gygax8 Added
gygax9 Added
gygax_armor Added
gygax_chassis Added
gygax_harness+o Added
gygax_harness Added
gygax_head+o Added
gygax_head Added
gygax_l_arm+o Added
gygax_l_arm Added
gygax_l_leg+o Added
gygax_l_leg Added
gygax_r_arm+o Added
gygax_r_arm Added
gygax_r_leg+o Added
gygax_r_leg Added

Resources/Textures/_Goobstation/Objects/Specific/Mech/ripleymkii_construction.rsi

State Old New Status
ripleymkii0 Added
ripleymkii1 Added
ripleymkii10 Added
ripleymkii11 Added
ripleymkii12 Added
ripleymkii13 Added
ripleymkii14 Added
ripleymkii15 Added
ripleymkii16 Added
ripleymkii17 Added
ripleymkii18 Added
ripleymkii19 Added
ripleymkii2 Added
ripleymkii20 Added
ripleymkii3 Added
ripleymkii4 Added
ripleymkii5 Added
ripleymkii6 Added
ripleymkii7 Added
ripleymkii8 Added
ripleymkii9 Added
ripleymkii_chassis Added
ripleymkii_harness+o Added
ripleymkii_harness Added
ripleymkii_l_arm+o Added
ripleymkii_l_arm Added
ripleymkii_l_leg+o Added
ripleymkii_l_leg Added
ripleymkii_r_arm+o Added
ripleymkii_r_arm Added
ripleymkii_r_leg+o Added
ripleymkii_r_leg Added
ripleymkii_upgrade_kit+o Added
ripleymkii_upgrade_kit Added

Edit: diff updated after 804d0e5

@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 20, 2025
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 20, 2025
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 20, 2025
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 20, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DEATHB4DEFEAT DEATHB4DEFEAT Awaiting requested review from DEATHB4DEFEAT DEATHB4DEFEAT is a code owner

@VMSolidus VMSolidus Awaiting requested review from VMSolidus VMSolidus is a code owner

@Remuchi Remuchi Awaiting requested review from Remuchi Remuchi is a code owner

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sleepyyapril @JohnnyDangerSpace @gluesniffler